Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Sun, 9 May 2010 22:52:44 +0000 (22:52 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Sun, 9 May 2010 22:52:44 +0000 (22:52 +0000)
commit38c6ed5f6ece649267d0e5915bbc6a98106d6e25
treeb16681802f44324d1b8d92d529a023ba61b8323a
parentbc13ddb8c7fbe4b86fedd4b2fc53bf678066a27c
parentee6faa1402c5fe4cab1634e41ff6732f2f95764e
Merge from mainline.